Merge from mainline.

diff --cc src/Makefile.in
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/term.c
Simple merge

diff --cc src/window.h
Simple merge

diff --cc src/xdisp.c
Simple merge